From 2e1cc247bc5d8970b45ec618594996ba62bef180 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 Jan 2011 18:01:34 -0800 Subject: [PATCH] * lisp/info-xref.el (info-xref-docstrings): Replace cl function. --- lisp/ChangeLog | 4 ++++ lisp/info-xref.el | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f23c96edd68..1912bf9ad0c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-01-16 Glenn Morris + + * info-xref.el (info-xref-docstrings): Replace cl function. + 2011-01-16 Kevin Ryde * info-xref.el: Version 3. diff --git a/lisp/info-xref.el b/lisp/info-xref.el index a92d9d89da6..cdeba932eda 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -479,20 +479,21 @@ in the files, the Lisp code checked doesn't have to be loaded, and links can be in the file commentary or elsewhere too. Even .elc files can usually be checked successfully if you don't have the sources handy." - (interactive - (let* ((default (and buffer-file-name + (let* ((default (and buffer-file-name (file-relative-name buffer-file-name))) - (prompt (if default - (format "Filename with wildcards (%s): " - default) - "Filename with wildcards: ")) - (pattern (read-file-name prompt nil default)) - (filename-list (file-expand-wildcards pattern - t))) ;; absolute filenames - (eval-and-compile - (require 'cl)) ;; for `remove-if' - (setq filename-list (remove-if 'info-xref-lock-file-p filename-list)) + (prompt (if default + (format "Filename with wildcards (%s): " + default) + "Filename with wildcards: ")) + (pattern (read-file-name prompt nil default)) + ;; absolute filenames + (filename-list (file-expand-wildcards pattern t)) + newlist) + (setq filename-list + (dolist (file filename-list (nreverse newlist)) + (or (info-xref-lock-file-p file) + (push file newlist)))) (unless filename-list (error "No files: %S" pattern)) (list filename-list))) -- 2.30.2